bugfixes and missing menu keys