cleaning out the cruft and adding in some useful starting points