fixing bugs and styles.