Numerous Debugs/improved functionality