Pushing latest source w/ various edits