lots of more changes. its morning now :(