fixed bugs
fixed more bugs