Fixed some problems with spaces and updated samples