Added few more plotting options