more sanity checks

I hope we can add more sanity checks. I'll give more thoughts in the future. At the moment let me simply open this issue to remind me it's a todo task