Update of all things

Fixes for many things, +namechange