have bugs fixed
merging
Recent changes