Fixing bug
Adding script files/packages
fixing build