Some Additions/Fixes