Removed typhoon, fixed some dependencies, housekeeping.