Wall bug 'fixed' and minor improvements