updated a little, might be moving back to vim...