Fixes and changes, ready for development