Merge issues fixed, except bottom stuff