fix

fix some things and tried to add menu-support..