updates to fix stuff i broke
still fixing stuff i broke =(
Merge branch 'sturg'
fixing what i broke... almost done