Minor changes, finishing for the night