Changed some small issues, == to .equals etc.