Additions and fixes
Wip