Updated comments and imnplemented a scanner test