updated to the new wilson model
Update to Katana RC2, DB cleanup