bugfixes + renamed, colored