Mostly bugfixes

Also Right click base code