Improved resolve return thingy, other stuff