some improvements, bug fixes, name prefix annotation, new exception policy