Several errors & feature fixes.