dunno wat im doing now, and some corrections