Some refactoring and sprites added