More bug fixing, please work now....