- fixed usage of system version
- fixed a few glitches