Edited and added alot to vim