state wrapping! makes life easier
bugfixes