Some formatting and data passing changes