Additions from vim tips wiki and amix