changes to fix right click menu and changes found from other repos