Improved optimisation

Optimisation form
Optimisation strategies
Import of VVB kalendar