stage 5 bug fixes - not bad now