Fixed bugs
Sneaky soya souce