Many fixes and now the details and finishing touches