Fixed several small things