Fixes/new features