Some clean up and small updates...