Development

just some basic cleanup tested on a couple of cloud servers with success.