Bug fixes
Added some new files