Fixed a couple of minor bugs. Prepared everything for integration with the website.