typofixes + structure for new player