Fixes and more features