Added files from previous project; also small fixes