Added cleaning of data and asynchronous content loading

Horrified this was not merged, thought it was. Then again #339 is still open.