Adding area charts and fixing various bugs