add composer + some fixes