All WaitForButton blocks added, motors bug fixed and added small corrections.