Fixes & New Functions