some big changes for  v0.3

used for today's presentation