fixed bugs ... way too many