bugfixes and menu changes