Adding needed function comments; removing code not ready for primetime