cleanup
add primary and foreign keys
fix specs