addded title, description + some cleanups