Fixed minor bugs, but still need to add validation and run programme features