cleanup and minor additions