improved current directory expand user crap