Fix some of the things i broke, some valid lines still not working correctly with various macro/labels etc combinations