fixed bugs again