Removed unnecessary stuff and some other minor fixes
(mostly stupid side comments)