Lots of small fixes.
[WIP] - Continue condition impl.