Fixes and cleanup. New database & console stuff in play.cpp