Fixing boundary lines and a few mixed up variables