Fixed a few more bugs. Ready to go now.