V 1.0b - correct few little things for a true running version