bunch of stuff I forgot to commit