Fixed indents.
adding location filter on disk select
code refactory for #32
correcting assert