added inflectors and cleaned up some stuff