Updated main, got some rubbish code in it