Few bug fixes and timing fixes, and other extras