a unch of changes. bad me for not keeping up