Improve wall collision algorithm. Finally