A few changes after having to actually use the thing