Fix various items and adds comments