Minor changes
fixing bugs