more make improvements