fixing errors
fixing bugs