got rid of DB arg everywhere, started cleaning everything up a little