fixed some minor bugs and replaced user to partner