fixing a few little things, merging samples/user_auth and skeleton to be the same