Fixed Most issues with new composer

Everything seems to be working. Not much tested.