Nothing special

Just a few modifications and preparations for new features
Commit fix