omg so much stuff

Totally forgot to commit changes...