get rid of computable tag name. some bug fixes, renamings