fix major bugs!!