got rid of hovers
removed swp
fixed merge stuff