a bit fixed walls, clean up, some small fixes