Fixed a few problems, Version 1.0.2