A shitload of bug fixes and updates

+ new menu functionality