Now works nicely in apache, and some style updates