servicelib code sync, general updates and enhacements