Updated cmake lists, added delay option