fixed small things
merged
comments finished, styling dialed in more