adding some stuff!
fixing merge issues