Fixed a few things with Tom.