trim some fat that is no longer needed
add version specification, switch around some stuff to work better on Spoonium