Fixed a bug, added more info