removed all brick images, refactoring, other small changes