Some minor faults fixed :)