SQL Fix + style and language updates

SQL Fix + style and language updates