fixing bugs, now works on Husky