Version 1.0 all fixed now