updating and fixing code branches