Solved the sticky wall problem and did some clean up