fixed more bugs.