General Fixes + clean up