Changes and bugfixes here and there

And report!!