Error fixes + mockups included