Various fixes and corrections - includes test jump (to be removed)