Update Main

Fixed a few issues i was having :P