compile and minor changes