add real content and fixes