Project complete, minor bug fixes