upgraded version and pretty much bug free