Further improvements to features, TODOs removed and added