created more attributes and cleaned up some hardcoded stuff