Homec4science

rAKA/optimization
bugfixes/correcting-for…