colors added, some bugfixes