Smaller changes

Added time running out and fixed bugs