Updated with Big Fixes

Bugs detected in testing and added support for encoders