cleaning up imports and removing trailing slashes from endpoints
fixing #125 some more.. and also fixing #126 while I am at it.
Merge pull request #128 from mvexel/develop

Fixing #125 and #126