Improvements and fixes! part 1 of 2