Add further improvements and content