serious bugs fixed
serious bugs fixed