fixed all little problems