minor changes
TODO: fix the pipelilne stall with exceptions
minor changes
work in progress