added a few annoying things
cleaning stuff up