Fixed a few bugs + latest version