some minor changes
still workin on getting short from data
some helper functions