fix major problems