Added Some Utils and Other Samll Fixes