cleaned up code, added secondary solutions
point-free changes
cleaned up some code
rewrote map'
minor updates