made misc changes, everything looks to be working right now