fixed bugs
more bugs fixed