#50 Tuned pipeline

Still missing some bits as described in the last commit message.