Bug Fixes & Added Index File.