Fixed a few bugs, 70% ish done.