added more RC keys. fixed carousel bug
merged conflicts