Misc progress and modifications