Worken on unit testing, bugfixes and codestyles.