various bugs fixed + new data