Some fixes and content added