initial post complete, some more improvements