Minor renaming etc
Fixed weird height changing bug
Merge remote-tracking branch 'origin/V1' into V1