Minor additions
Adding last things before splitting this up