removed error message and other misc fixes