improved some client side errors/warnings
merge