Fixes and more of a delay