fixed some model bugs, improve GUI info
fix merge conflicts