Finishing touches, couple small errors to clean up.