Fix	

Fixed some problems

Related to issue karlitrotski/CodingSpectator/#13

Pair Programming with @karlitrotski