added a lot of things
a lot of alterations...again.