fix composer & misc