minor bug fixes also in Christmas time!

Happy Christmas to all the ShineISP supporters