Code Updates

Bug Fixes, New Implementations