TODO v.0.4.4

fixed few bugs