fixed more bugs!