Updated files
Fixed Entry
add few things