Fixed a couple of bugs with recording and added some padding