minor bug fixes and added uni schema