Bugfixes: System & Register

fixed some minor bugs