various updates
Merge branch 'master' of github.com:Bocete/adsl