fixed a few things that were broken
fixing conflicts