5 Fixes, all in one

This is a regular pull request - based on my original repo: "piotr-lapinski-odesk-ios-test / piotr-lapinski-odesk-ios-test"