modularize + get flags working properly + bump version for release