Fixed bug in PB calculation
Fixed map propblem, started to add a select for the type of outing