Chart added, few bugs fixed.