Fixed some derps (Includes major update to code)