'Database Clear' added, minor changes