almost everything should work now