Fixed crash + tarted up a bit