Some fixes for as far as the program can get.