updates, added combos & other fun points things

Signed-off-by: Travis Martin <travis.h.martin@gmail.com>