minor edits and updates to core and daemon libs