Fixed sprite issues; some test stuff I forgot to commit a week ago