more stuff; layout not perfect