Bug squishing and further edits