Fixed bugs, began work on end screen