Minor improvements on Noobia upon feedback.