fixes few things