small changes to schema and fixing bug with parser