bunch of changes to a mostly DOA project... yey (ノಠ益ಠ)ノ