jam cleanup
validation added
correct dependencies