Various Updates

Added a few little things to improve performance, usefulness, etc.