Hot Fixes

Still with setup of the proyect