Fixed: Minor bug, also added some more code comments.