fixed bugs, got rid of samples