Updated Multiple Things. Might Fix #18