added security type models, improved cashflow, bug- and layout fixes along the way