merged
fixing bugs