Homec4science

rAKA/optimization
bugfixes/clean…