Fixed more formatting and usability issues.

All code loops correctly and directions are more clear for user.