reorganized props and commented/renamed device