Added composer + pear + minor fixes