Pull request for fixing of issues

Yay, fixing issues!