-Minor changes of ternary to ors. Some documentation.