Fixed things that annoied me.