Raw version works
Removed small bugs, added release version