Updated with few more changes

Updated to include proper forms for Oracle, Java, Android, Windows, apostrophes, plz halp no more!