Udpated with few more changes

Updated to include proper forms for Oracle, Java, Android, win[dows](n) => Windows [n], apostrophes, plz halp no more!