Merged in some leftover changes....