added padding, couple tweaks