Fixed a few things in compute modeling, added area modeling