cosmetics
removed serial uids
started model rewrite