Minor changes to structure, sleeping, console output.