update

just syncing the few changes i made..