debugged
fixes