Fixed bug and added my stuff