wall comprehension added, various stuff optimized