added couple things, minor fixes/changes