* Fixes and some simplification