Fixing some comments and headers on some Java Files