Robert -> 6/18-19/13 - Misc. Changes