cleaned up wall handling
Implemented keys