added shortnames, fixing errors
fixed (most) errors associated with shortnames i think