changed to indv and comp accounts, added check for company accounts not activated
some changes models etc