further tweaks and revisions while working on webapp