modified functions, added data, combined client/account pages