fixed comments, cleaned includes, fixed SqliteBack regression test