optimisation

many optimisations and steps toward a better future