new accounts added, minor cleanup as well