Multiple fixes for pending issues

Not sure if anyone has tested this but to me it apparently didn't work at all. Now it does, somehow at least.

Fixes #1 (closed), #2 (closed), #3 (closed), #4 (closed) and #6 (closed)