A few things added. forgot to commit a while back.