Bug Fixes + improvements.