major fix with charts. small tweaks.