Patch 1

Pull request with all changes i've done by the time