Fixed parser, more shopowner stuff