few fix + removed framework version + better middleware