Bug fixes + minor additions