improvement

basic improvements