refactoring, paint fix, minor stuff