Fixes and new developments