first draft 0.4

updates on 0.3