changelog
more cleanup, bugfix in apc modes