Adding some flags and documentation