Fixes and new functionallity