some enhancements

I did some enhancements to najabo. It's probably a good idea, to merge them in youre branche.
Let me know if you like to exclude something.

Cheers 

Benedikt