syntax cleanup
adjustments for releases