Various bug fixes, time limit is now enbale with safe navigation