Fixed Initial Bugs