various fixes, menu changes