Let's not forget to return the output... duh..

Also fixed some deprecated messages