Fix syntax errors and improve current tile position