updated lots of things...makes life a little easier