Minor bug fix with setting zero page. Some more code cleanup