ver 0.2, fixes, refactoring