Improved various stuff