clean code and stuff
some error report rework