Finished bullets and refactored a bit