Fixes and new features working