major reshuffle; updated/fixed build