Minor fixes, laid some groundwork for adding powerups.