some much needed updates & revisions