changed font weight
added some todos