bunch of changes i forgot to commit