Fixed bug and minor changes