Fixed 2 major bugs - see readme.