fiexed errors i hope