issue fixes + proper database user