changes, lots to uploading and templates