Several improvements and more content