Added implementation of first option wall generation. + fixes