fixed stupid line-skipping bug and added a bit more info-gathering