reworked some parameters
Merge branch 'satellite' of github.com:MGM-KTH/travelguide into satellite