fixed more bugs
fixing more bugs