Minor enhancements - still needs fixes