Started various improvements