some minor bugfixes,

fit on CBC0 would not work, that is fixed now!