Fixed a few problems.
Fixed problems