Incorporated jfee changes, added new files