Cleaning

Did some small cleaning and added warnings for parts that might reveal to be a problem later