1.3

Added more customise-ability and condensed to one while loop, and
bugfixes