added various stuff...
still WIP, need to check with vossi's requierements