adjusted wait times and properly included calculator in keywindows