- some isset() added
- bugs fixed