cleaned project; touches on device