some more fix and features
fix conflict