Fixed issue with reset of plank, other minor cleanup.