deps
fixed couple issues