Addded boolean for delay

Also cleaned up all the System prints used while debugging, updated all
the javadoc