creating explicit option types
updated all charts
small refactoring