Updated for usage and features

Updated to cover actual usage and working features.