Bug fixes & minor feature improvements.