bugfix, color fix, etc