resolved some errors, minor changes
fixed up the resolve command