fixing stuff thats broked
fixing merge conflict, fixed info rendering