Fixes CS and small mistakes