1) Fixed minor bugs 2) Fixed use of Continue button