fixing some minor details