Some minor changes
Added correct code for phps built in server