Updated catch
There is something very wrong here. test this on another compiler/system
Added missing inlines
More tests