removed some warnings before submitting