build fixed again; single indexing added [not tested
cleanup options, better user feedback