Added composer, and solve some issues