Adding missing stuff

Fixing maybe additional issues and testing stuff. This isn't all but just a part of what I am planning to do.