Bit more work on Apache and fixing the install process.

Please note: None of this is tested yet!