Some more improvements on margins and some other stuff