Added some merges and misc. notes