fixed more bugs
fixed more bugs