Update 3

Finishing touches and tweaks