Add some minor features and testing