Fixed division by zero bug, added more utils