couple bugs fixed