more bugs
fixes