Various additions/edits