a lot of changes
finished version 0.9