Added extensions, fixes errors
Should be first beta release