- lots of fix and features
