minor changes, TODO:database deletion (or migration?)