updated some hard coded crap so it will work with new db