mostly finished still some tablet bugs