fixed notation, added block of header stuff