Added to padding, fixed some syntax quoting