Quixk Fix

MOst of the problems have been fixed