Finished up most things... everything should work.
Fixed some minor bugs.