fixing few things