added some further basic features