cleaned up codes, small updates