fixed sqlite3 warnings
renamed some subsystems