Remove penalty and timing display
Fix various bugs