Also, fixed an enum name issue. No clue why visual studio actually compiled that without warnings/errors