Fixed lots of run time issues.
Fixed some more issues.