changes to tophat
smokebox changes (e.g. header)
merge with upsteam (allpower)