Finishing touchs.. a lot todo still