Added files and misc changes