Minor bug fixes + a hastily made class diagram