Working

Fixed Bugs, works now