adding some minor features