Bug fixes, walls tested