Fixed a few more bugs, added missing fields