added todo, fixed kick-assembly-constant