Better local serving to resolve #3 and some rework