Improved Some Code, Partial Changes