Clean up some code, add SQL 0.1