update documentation
update handler names
fix bug in parsing elif blocks with multiple elif statements