updated stuff
massive update
hey chris, take this shit.