Renamed some stuff, removed dependency on fun ext for the most part.