Ready for second release

Bug fixes