fixed some build things and made more uml friendly