Fleshed out models some, fixed broken references