fixes/improvments