added some requested features