Pull request 2

Fixed some other stuff