Bug fixes & minor changes