plz pull improvements to master branch

Can you please check if the stuff for walls still works (it should as the code for this is mostly untouched) and pull my contributions before my fork starts to diverts too much from your code?