reworked indexes, dialyzer
huge refact