Minor improvements

Hey,

I've added some minor features, hope it might be helpful.