Minor Changes + DB-Stuff