fixes for problems that I cant begin to comprehend