final bugfix and finish uni interface