More minor updates, TODO -> RFE