fine tuned some bugs