some todos and style checks