Some flag additions and fix broken images. Closes #13