Normal pr: Add & fix problems