initial stab at update of Occupy code
fix for a couple minor issues