Fix
Few fixes and adds