Changed lots of names
Fixed few minor issues