Cleaning up usage. Adding features.