working on apache integration
minor fixes