Back bug fixed, lap functionality added