New stuff

Added new Methods and changed a few variable types to make things work
better.