Functionality

Thanks for the codebase!
I've added a couple minor features for functionality. Maybe they can be of some use?