Some fixes and improvements

Hello,

I fixed some annoyances i encountered when i'm using poche. Feel free to merge these. Also, thank you for making poche.

Regards.