Fixes and comments
Fixed bugs with position logic
Missing semicolon