some bugs fixed jan15