Added various improvements