fixed all major issues