update path
comments, folds, reorg
cleanup, update names
spaces added
comments added
moved bottomline to extras