few improvements. fugitive and stuff