fixed bugs
more bugs