Bug fixes + improvements.