Version 0.2: mostly cleanup