Some more cosmetical changes and a new DB