comments and db connection fix