bugfix, color fix etc.