Many fixes, please let me know if you see anything wonky.