Improved the Reactive interface (I hope). Cleaned up some of the rest