cleaned up a little and changed versions to avoid clashes
cleaned stuff