Ek feedback

Nice job,

I left some comments in the commit descriptions