Ready to merge!
fixing bugs