Version 0.3 in progress. Bugfixes