small fixxes + db
more to read :)