expanded package globs so make on ubuntu no longer complains
address review comments: updated docs and shifted some code for better readability