Many Many Additions and Fixes

Many additions, still need to make good documentation in the Readme