merge fixes, code works for me now