More cards added and some cleanup