removed warnings, updated styles