lots of updates that i forgot to commit..