Squashing miniscule bugs and updating some interface stuff