added more features
Merge branch 'cleanup_main' of https://github.com/foxish/AggieExperts into cleanup_main