Fixes and implementation of uc (not done), see readme.