Some small things to keep here for proper dev later