fixed more bugs...