Fixes and new functionality