Updated version, bug fixes