done restructuring
nao its done
What am I doing? Now it's done
general: fixed bugs from refactoring + log feature introduced