fix and revert some quick hacks; SMACK for not working in a separate branch