java'd up da code and made any changes thought should happen ;)