common exceptions fixed
cleanup