Massive Update to Functionality

Fixes.