All finished, minor bug fixes