All kinds of fixes for own use.

The needs on my project are a bit different than what is provided. Modified file naming and remote directory to better suit my needs.