Adding feathers and some other minor changes