dict unpacking stuff
removes error-prone dict code

closes #1