Aspects of F-Theory and M-Theory