Comment out Terminal again & a few prop changes