rebranded - ready for production
little fixes