Made things Objects!
fixed whitespacing issues
map updated