Got upload and character restricting working

#440