working contextmenu and bugfixes