Update

some changes, got rid of unimportant stuff