Semi-final changes

Fixed bugs, added bonuses, added comments....