Fixed some bugs, updated some menus, no major changes