[master] cap deploy + modifs