Improved various things