A few small improvements


The pic is broken. Not gonna mess with it any more. >:[