blubb
Added more special cases

should be all of them now..