fixed some problems, still some with the context menus though