Updated and Fixed Some Issues